bitkeeper revision 1.1654 (429f793bJpez_x78azX5iKCsmtPMUQ)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Thu, 2 Jun 2005 21:25:15 +0000 (21:25 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Thu, 2 Jun 2005 21:25:15 +0000 (21:25 +0000)
commitb7a0fb87b9fd4ed50006c31e9aaf7a7bdff3d060
tree733cf55a9da86074006d331b8a0b334aa325ea6a
parent7b9361498f418c0ddca3ee202add13d24da0f0cd
parent550e86d463b9eda10d94642aad1a719cf0102362
bitkeeper revision 1.1654 (429f793bJpez_x78azX5iKCsmtPMUQ)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk
20 files changed:
xen/arch/x86/i387.c
xen/arch/x86/irq.c
xen/arch/x86/smpboot.c
xen/arch/x86/vmx_io.c
xen/arch/x86/vmx_vmcs.c
xen/arch/x86/x86_32/asm-offsets.c
xen/arch/x86/x86_32/mm.c
xen/arch/x86/x86_32/seg_fixup.c
xen/arch/x86/x86_32/traps.c
xen/arch/x86/x86_64/asm-offsets.c
xen/arch/x86/x86_64/mm.c
xen/arch/x86/x86_64/traps.c
xen/common/dom0_ops.c
xen/common/event_channel.c
xen/common/sched_bvt.c
xen/common/sched_sedf.c
xen/drivers/char/console.c
xen/include/asm-x86/shadow.h
xen/include/xen/event.h
xen/include/xen/sched.h